Auto merge of #2331 - matklad:metadata-encodable-resolve, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 29 Jan 2016 23:44:29 +0000 (23:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 29 Jan 2016 23:44:29 +0000 (23:44 +0000)

Trivial merge